From 2e58274f2333b57a02a473acfdfbe8c561cebb76 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 27 Jun 2023 06:28:52 +0200 Subject: [PATCH] vulkan: Rename crossfade => cross-fade Preparation for the future. --- gsk/vulkan/gskvulkanrender.c | 6 +++--- ...ed.frag.spv => cross-fade-clip-rounded.frag.spv} | Bin ...ed.vert.spv => cross-fade-clip-rounded.vert.spv} | Bin ...sfade-clip.frag.spv => cross-fade-clip.frag.spv} | Bin ...sfade-clip.vert.spv => cross-fade-clip.vert.spv} | Bin ...sfade-rect.vert.spv => cross-fade-rect.vert.spv} | Bin .../resources/{crossfade.frag => cross-fade.frag} | 0 .../{crossfade.frag.spv => cross-fade.frag.spv} | Bin .../resources/{crossfade.vert => cross-fade.vert} | 0 .../{crossfade.vert.spv => cross-fade.vert.spv} | Bin gsk/vulkan/resources/meson.build | 4 ++-- 11 files changed, 5 insertions(+), 5 deletions(-) rename gsk/vulkan/resources/{crossfade-clip-rounded.frag.spv => cross-fade-clip-rounded.frag.spv} (100%) rename gsk/vulkan/resources/{crossfade-clip-rounded.vert.spv => cross-fade-clip-rounded.vert.spv} (100%) rename gsk/vulkan/resources/{crossfade-clip.frag.spv => cross-fade-clip.frag.spv} (100%) rename gsk/vulkan/resources/{crossfade-clip.vert.spv => cross-fade-clip.vert.spv} (100%) rename gsk/vulkan/resources/{crossfade-rect.vert.spv => cross-fade-rect.vert.spv} (100%) rename gsk/vulkan/resources/{crossfade.frag => cross-fade.frag} (100%) rename gsk/vulkan/resources/{crossfade.frag.spv => cross-fade.frag.spv} (100%) rename gsk/vulkan/resources/{crossfade.vert => cross-fade.vert} (100%) rename gsk/vulkan/resources/{crossfade.vert.spv => cross-fade.vert.spv} (100%) diff --git a/gsk/vulkan/gskvulkanrender.c b/gsk/vulkan/gskvulkanrender.c index 16b08f32b7..580d621d74 100644 --- a/gsk/vulkan/gskvulkanrender.c +++ b/gsk/vulkan/gskvulkanrender.c @@ -418,9 +418,9 @@ gsk_vulkan_render_get_pipeline (GskVulkanRender *self, { "texture", 1, gsk_vulkan_color_text_pipeline_new }, { "texture-clip", 1, gsk_vulkan_color_text_pipeline_new }, { "texture-clip-rounded", 1, gsk_vulkan_color_text_pipeline_new }, - { "crossfade", 2, gsk_vulkan_cross_fade_pipeline_new }, - { "crossfade-clip", 2, gsk_vulkan_cross_fade_pipeline_new }, - { "crossfade-clip-rounded", 2, gsk_vulkan_cross_fade_pipeline_new }, + { "cross-fade", 2, gsk_vulkan_cross_fade_pipeline_new }, + { "cross-fade-clip", 2, gsk_vulkan_cross_fade_pipeline_new }, + { "cross-fade-clip-rounded", 2, gsk_vulkan_cross_fade_pipeline_new }, { "blend-mode", 2, gsk_vulkan_blend_mode_pipeline_new }, { "blend-mode-clip", 2, gsk_vulkan_blend_mode_pipeline_new }, { "blend-mode-clip-rounded", 2, gsk_vulkan_blend_mode_pipeline_new }, diff --git a/gsk/vulkan/resources/crossfade-clip-rounded.frag.spv b/gsk/vulkan/resources/cross-fade-clip-rounded.frag.spv similarity index 100% rename from gsk/vulkan/resources/crossfade-clip-rounded.frag.spv rename to gsk/vulkan/resources/cross-fade-clip-rounded.frag.spv diff --git a/gsk/vulkan/resources/crossfade-clip-rounded.vert.spv b/gsk/vulkan/resources/cross-fade-clip-rounded.vert.spv similarity index 100% rename from gsk/vulkan/resources/crossfade-clip-rounded.vert.spv rename to gsk/vulkan/resources/cross-fade-clip-rounded.vert.spv diff --git a/gsk/vulkan/resources/crossfade-clip.frag.spv b/gsk/vulkan/resources/cross-fade-clip.frag.spv similarity index 100% rename from gsk/vulkan/resources/crossfade-clip.frag.spv rename to gsk/vulkan/resources/cross-fade-clip.frag.spv diff --git a/gsk/vulkan/resources/crossfade-clip.vert.spv b/gsk/vulkan/resources/cross-fade-clip.vert.spv similarity index 100% rename from gsk/vulkan/resources/crossfade-clip.vert.spv rename to gsk/vulkan/resources/cross-fade-clip.vert.spv diff --git a/gsk/vulkan/resources/crossfade-rect.vert.spv b/gsk/vulkan/resources/cross-fade-rect.vert.spv similarity index 100% rename from gsk/vulkan/resources/crossfade-rect.vert.spv rename to gsk/vulkan/resources/cross-fade-rect.vert.spv diff --git a/gsk/vulkan/resources/crossfade.frag b/gsk/vulkan/resources/cross-fade.frag similarity index 100% rename from gsk/vulkan/resources/crossfade.frag rename to gsk/vulkan/resources/cross-fade.frag diff --git a/gsk/vulkan/resources/crossfade.frag.spv b/gsk/vulkan/resources/cross-fade.frag.spv similarity index 100% rename from gsk/vulkan/resources/crossfade.frag.spv rename to gsk/vulkan/resources/cross-fade.frag.spv diff --git a/gsk/vulkan/resources/crossfade.vert b/gsk/vulkan/resources/cross-fade.vert similarity index 100% rename from gsk/vulkan/resources/crossfade.vert rename to gsk/vulkan/resources/cross-fade.vert diff --git a/gsk/vulkan/resources/crossfade.vert.spv b/gsk/vulkan/resources/cross-fade.vert.spv similarity index 100% rename from gsk/vulkan/resources/crossfade.vert.spv rename to gsk/vulkan/resources/cross-fade.vert.spv diff --git a/gsk/vulkan/resources/meson.build b/gsk/vulkan/resources/meson.build index 35cfec7610..019d9d4da8 100644 --- a/gsk/vulkan/resources/meson.build +++ b/gsk/vulkan/resources/meson.build @@ -17,7 +17,7 @@ gsk_private_vulkan_fragment_shaders = [ 'border.frag', 'color.frag', 'color-matrix.frag', - 'crossfade.frag', + 'cross-fade.frag', 'inset-shadow.frag', 'linear.frag', 'mask.frag', @@ -31,7 +31,7 @@ gsk_private_vulkan_vertex_shaders = [ 'border.vert', 'color.vert', 'color-matrix.vert', - 'crossfade.vert', + 'cross-fade.vert', 'inset-shadow.vert', 'linear.vert', 'mask.vert', -- 2.30.2